[HLSL] Add support for fixed-size global resource arrays #152209
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds support for fixed-size resource arrays declared at the global scope. When a global resource array is indexed to access an individual resource, codegen will translate the `ArraySubscriptExpr` into a constructor call for the specific resource record type and binding. Closes llvm#145424
|
Making this a draft for now because it only supports @s-perron - is your change ready to get merged? |
…urce-array-subscript-one
|
I'll see what I can do. I'm on vacation right now. I need to make the change you suggested |
…urce arrays (and cbuffers)
If that's the only thing blocking the merge, feel free to go ahead and merge it without my suggested change. I can do the update on my side. I think I need to move that function higher in the file anyway. |
You can test this locally with the following command:git-clang-format --diff HEAD~1 HEAD --extensions cpp,h -- clang/include/clang/AST/Type.h clang/include/clang/Sema/SemaHLSL.h clang/lib/AST/Type.cpp clang/lib/CodeGen/CGExpr.cpp clang/lib/CodeGen/CGHLSLRuntime.cpp clang/lib/CodeGen/CGHLSLRuntime.h clang/lib/CodeGen/CodeGenModule.cpp clang/lib/Sema/SemaHLSL.cppView the diff from clang-format here.diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp b/clang/lib/CodeGen/CGHLSLRuntime.cpp
index 8a362cc55..915e967c3 100644
--- a/clang/lib/CodeGen/CGHLSLRuntime.cpp
+++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp
@@ -857,7 +857,8 @@ std::optional<LValue> CGHLSLRuntime::emitResourceArraySubscriptExpr(
}
// find binding info for the resource array
- // (for implicit binding an HLSLResourceBindingAttr should have been added by SemaHLSL)
+ // (for implicit binding an HLSLResourceBindingAttr should have been added by
+ // SemaHLSL)
QualType ResourceTy = ArraySubsExpr->getType();
HLSLVkBindingAttr *VkBinding = ArrayDecl->getAttr<HLSLVkBindingAttr>();
HLSLResourceBindingAttr *RBA = ArrayDecl->getAttr<HLSLResourceBindingAttr>();
@@ -865,8 +866,9 @@ std::optional<LValue> CGHLSLRuntime::emitResourceArraySubscriptExpr(
// lookup the resource class constructor based on the resource type and
// binding
- CXXConstructorDecl *CD = findResourceConstructorDecl(
- ArrayDecl->getASTContext(), ResourceTy, VkBinding || RBA->hasRegisterSlot());
+ CXXConstructorDecl *CD =
+ findResourceConstructorDecl(ArrayDecl->getASTContext(), ResourceTy,
+ VkBinding || RBA->hasRegisterSlot());
// create a temporary variable for the resource class instance (we need to
// return an LValue)
diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp
index 5bfb8b933..baf30f6a9 100644
--- a/clang/lib/Sema/SemaHLSL.cpp
+++ b/clang/lib/Sema/SemaHLSL.cpp
@@ -3750,9 +3750,9 @@ void SemaHLSL::createResourceRecordCtorArgs(const Type *ResourceTy,
uint32_t OrderID = (RBA && RBA->hasImplicitBindingOrderID())
? RBA->getImplicitBindingOrderID()
: getNextImplicitBindingOrderID();
- IntegerLiteral *OrderId = IntegerLiteral::Create(
- AST, llvm::APInt(UIntTySize, OrderID), AST.UnsignedIntTy,
- SourceLocation());
+ IntegerLiteral *OrderId =
+ IntegerLiteral::Create(AST, llvm::APInt(UIntTySize, OrderID),
+ AST.UnsignedIntTy, SourceLocation());
Args.append({Space, RangeSize, Index, OrderId, Name});
}
}
|
|
I am going to split the PR into 2 to make it easier to review. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for fixed-size resource arrays declared at the global scope.
When a global resource array is indexed to access an individual resource, codegen will translate the
ArraySubscriptExprinto a constructor call for the specific resource record type and binding.Closes #145424